dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f3ac546)
Prefix Vector specific ids (head-base|page-base|head|panel) with mw- per bug 23597.
authorPlatonides <platonides@users.mediawiki.org>
Wed, 9 Jun 2010 11:28:46 +0000 (11:28 +0000)
committerPlatonides <platonides@users.mediawiki.org>
Wed, 9 Jun 2010 11:28:46 +0000 (11:28 +0000)
It may be a good idea to rename further the confusing head (eg. to mw-skin-head).
Lots of mentions of headers, <head>, document.getElementsByTagName('head')... but no real usage of that.

includes/DefaultSettings.php patch | blob | history
skins/Vector.php patch | blob | history
skins/common/wikibits.js patch | blob | history
skins/vector/experiments/babaco-colors-a.css patch | blob | history
skins/vector/experiments/babaco-colors-b.css patch | blob | history
skins/vector/experiments/babaco-colors-c.css patch | blob | history
skins/vector/experiments/new-tabs.css patch | blob | history
skins/vector/main-ltr.css patch | blob | history
skins/vector/main-rtl.css patch | blob | history

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e79e30d..c2b99bc 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1676,7 +1676,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches do not keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '286';
+$wgStyleVersion = '287';
 
 
 # Server-side caching:
diff --git a/skins/Vector.php b/skins/Vector.php
index 4c30eec..ea0e1ae 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -470,8 +470,8 @@ class VectorTemplate extends QuickTemplate {
                // Output HTML Page
                $this->html( 'headelement' );
 ?>
-               <div id="page-base" class="noprint"></div>
-               <div id="head-base" class="noprint"></div>
+               <div id="mw-page-base" class="noprint"></div>
+               <div id="mw-head-base" class="noprint"></div>
                <!-- content -->
                <div id="content"<?php $this->html('specialpageattributes') ?>>
                        <a id="top"></a>
@@ -529,7 +529,7 @@ class VectorTemplate extends QuickTemplate {
                </div>
                <!-- /content -->
                <!-- header -->
-               <div id="head" class="noprint">
+               <div id="mw-head" class="noprint">
                        <?php $this->renderNavigation( 'PERSONAL' ); ?>
                        <div id="left-navigation">
                                <?php $this->renderNavigation( array( 'NAMESPACES', 'VARIANTS' ) ); ?>
@@ -540,7 +540,7 @@ class VectorTemplate extends QuickTemplate {
                </div>
                <!-- /header -->
                <!-- panel -->
-                       <div id="panel" class="noprint">
+                       <div id="mw-panel" class="noprint">
                                <!-- logo -->
                                        <div id="p-logo"><a style="background-image: url(<?php $this->text( 'logopath' ) ?>);" href="<?php echo htmlspecialchars( $this->data['nav_urls']['mainpage']['href'] ) ?>" <?php echo $this->skin->tooltipAndAccesskey( 'p-logo' ) ?>></a></div>
                                <!-- /logo -->
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 97e917a..94d1b2a 100644 (file)
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -247,7 +247,7 @@ function updateTooltipAccessKeys( nodeList ) {
                // optimization technique.
                var linkContainers = [
                        'column-one', // Monobook and Modern
-                       'head', 'panel', 'p-logo' // Vector
+                       'mw-head', 'mw-panel', 'p-logo' // Vector
                ];
                for ( var i in linkContainers ) {
                        var linkContainer = document.getElementById( linkContainers[i] );
diff --git a/skins/vector/experiments/babaco-colors-a.css b/skins/vector/experiments/babaco-colors-a.css
index a8eb5c4..8e414ea 100644 (file)
--- a/skins/vector/experiments/babaco-colors-a.css
+++ b/skins/vector/experiments/babaco-colors-a.css
@@ -13,7 +13,7 @@ html .thumbimage,
 }
 
 /* Framework */
-#page-base {
+#mw-page-base {
        background-color: inherit !important;
        background-image: none !important;
 }
@@ -65,10 +65,10 @@ h2 .editsection,
        font-family:sans-serif;
        font-weight:normal;
 }
-body #panel div.portal div.body {
+body #mw-panel div.portal div.body {
        background-image:url(images/new-portal-break-ltr.png);
 }
-body.rtl #panel div.portal div.body {
+body.rtl #mw-panel div.portal div.body {
        background-image:url(images/new-portal-break-rtl.png);
 }
 body div.vectorTabs li a, div.vectorTabs li a span{
@@ -101,7 +101,7 @@ div.thumbinner{
        border: 1px solid #cccccc;
        background-color: #f7f7f7;
 }
-#panel div.portal h5 {
+#mw-panel div.portal h5 {
        font-weight:bold;
        margin-bottom:0;
        padding-bottom:0.05em;
diff --git a/skins/vector/experiments/babaco-colors-b.css b/skins/vector/experiments/babaco-colors-b.css
index 6847e81..227e197 100644 (file)
--- a/skins/vector/experiments/babaco-colors-b.css
+++ b/skins/vector/experiments/babaco-colors-b.css
@@ -8,7 +8,7 @@ html .thumbimage,
 }
 
 /* Framework */
-#page-base {
+#mw-page-base {
        background-color: inherit !important;
        background-image: none !important;
 }
diff --git a/skins/vector/experiments/babaco-colors-c.css b/skins/vector/experiments/babaco-colors-c.css
index d39fa8c..7f4666b 100644 (file)
--- a/skins/vector/experiments/babaco-colors-c.css
+++ b/skins/vector/experiments/babaco-colors-c.css
@@ -1,7 +1,7 @@
 /* Babaco Color Scheme C */
 
 /* ridding ourselves of the gradient */
-#page-base {
+#mw-page-base {
        background-color: inherit !important;
        background-image: none !important;
 }
@@ -53,7 +53,7 @@ h2 .editsection,
 #toc h2, .toc h2 {
        font-weight:normal;
 }
-body #panel div.portal div.body {
+body #mw-panel div.portal div.body {
        background-image:url(images/new-portal-break-ltr.png);
 }
 
@@ -77,7 +77,7 @@ div.thumbinner {
        border: 1px solid #cccccc;
        background-color: #f7f7f7;
 }
-#panel div.portal h5 {
+#mw-panel div.portal h5 {
        font-weight:bold;
        margin-bottom:0;
        padding-bottom:0.05em;
diff --git a/skins/vector/experiments/new-tabs.css b/skins/vector/experiments/new-tabs.css
index 9ae6eb0..e3850e8 100644 (file)
--- a/skins/vector/experiments/new-tabs.css
+++ b/skins/vector/experiments/new-tabs.css
@@ -191,7 +191,7 @@
                direction: rtl;
        }
        /* @noflip */
-       body #head div.vectorMenu h5 {
+       body #mw-head div.vectorMenu h5 {
                background-image: url(../images/arrow-down-icon.png);
                background-position: center center;
                background-repeat: no-repeat;
@@ -319,4 +319,4 @@
 }
 .wikiEditor-ui-tabs div.current a {
        background: #FFFFFF;
-}
\ No newline at end of file
+}
diff --git a/skins/vector/main-ltr.css b/skins/vector/main-ltr.css
index 3c36af5..4541ff7 100644 (file)
--- a/skins/vector/main-ltr.css
+++ b/skins/vector/main-ltr.css
@@ -38,14 +38,14 @@ div#content {
        color: black;
 }
 /* Head */
-#page-base {
+#mw-page-base {
        height: 5em;
        background-color: white;
        background-image: url(images/page-fade.png?1);
        background-position: bottom left;
        background-repeat: repeat-x;
 }
-#head-base {
+#mw-head-base {
        margin-top: -5em;
        margin-left: 10em;
        height: 5em;
@@ -53,13 +53,13 @@ div#content {
        background-position: bottom left;
        background-repeat: repeat-x;
 }
-div#head {
+div#mw-head {
        position: absolute;
        top: 0;
        right: 0;
        width: 100%;
 }
-div#head h5 {
+div#mw-head h5 {
        margin: 0;
        padding: 0;
 }
@@ -215,20 +215,20 @@ div#head h5 {
        }
        /* OVERRIDDEN BY COMPLIANT BROWSERS */
        /* @noflip */
-       div#head div.vectorMenu h5 {
+       div#mw-head div.vectorMenu h5 {
                float: left;
                background-image: url(images/tab-break.png?1);
                background-repeat: no-repeat;
        }
        /* IGNORED BY IE6 */
-       div#head div.vectorMenu > h5 {
+       div#mw-head div.vectorMenu > h5 {
                background-image: none;
        }
-       div#head div.vectorMenu h5 {
+       div#mw-head div.vectorMenu h5 {
                background-position: bottom left;
                margin-left: -1px;
        }
-       div#head div.vectorMenu h4 {
+       div#mw-head div.vectorMenu h4 {
                display: inline-block;
                float: left;
                font-size: 0.8em;
@@ -386,17 +386,17 @@ div#head h5 {
                height: 100%;
        }
 /* Panel */
-div#panel {
+div#mw-panel {
        position: absolute;
        top: 160px;
        padding-top: 1em;
        width: 10em;
        left: 0;
 }
-       div#panel div.portal {
+       div#mw-panel div.portal {
                padding-bottom: 1.5em;
        }
-       div#panel div.portal h5 {
+       div#mw-panel div.portal h5 {
                font-weight: normal;
                color: #444444;
                padding: 0.25em;
@@ -406,7 +406,7 @@ div#panel {
                border: none;
                font-size: 0.75em;
        }
-       div#panel div.portal div.body {
+       div#mw-panel div.portal div.body {
                margin: 0;
                padding-top: 0.5em;
                margin-left: 1.25em;
@@ -414,14 +414,14 @@ div#panel {
                background-repeat: no-repeat;
                background-position: top left;
        }
-       div#panel div.portal div.body ul {
+       div#mw-panel div.portal div.body ul {
                list-style: none;
                list-style-image: none;
                list-style-type: none;
                padding: 0;
                margin: 0;
        }
-       div#panel div.portal div.body ul li {
+       div#mw-panel div.portal div.body ul li {
                line-height: 1.125em;
                padding: 0;
                padding-bottom: 0.5em;
@@ -429,10 +429,10 @@ div#panel {
                overflow: hidden;
                font-size: 0.75em;
        }
-       div#panel div.portal div.body ul li a {
+       div#mw-panel div.portal div.body ul li a {
                color: #0645ad;
        }
-       div#panel div.portal div.body ul li a:visited {
+       div#mw-panel div.portal div.body ul li a:visited {
                color: #0b0080;
        }
 /* Footer */
diff --git a/skins/vector/main-rtl.css b/skins/vector/main-rtl.css
index dabe072..7211777 100644 (file)
--- a/skins/vector/main-rtl.css
+++ b/skins/vector/main-rtl.css
@@ -38,14 +38,14 @@ div#content {
        color: black;
 }
 /* Head */
-#page-base {
+#mw-page-base {
        height: 5em;
        background-color: white;
        background-image: url(images/page-fade.png?1);
        background-position: bottom right;
        background-repeat: repeat-x;
 }
-#head-base {
+#mw-head-base {
        margin-top: -5em;
        margin-right: 10em;
        height: 5em;
@@ -53,13 +53,13 @@ div#content {
        background-position: bottom right;
        background-repeat: repeat-x;
 }
-div#head {
+div#mw-head {
        position: absolute;
        top: 0;
        left: 0;
        width: 100%;
 }
-div#head h5 {
+div#mw-head h5 {
        margin: 0;
        padding: 0;
 }
@@ -215,20 +215,20 @@ div#head h5 {
        }
        /* OVERRIDDEN BY COMPLIANT BROWSERS */
        /* @noflip */
-       div#head div.vectorMenu h5 {
+       div#mw-head div.vectorMenu h5 {
                float: left;
                background-image: url(images/tab-break.png?1);
                background-repeat: no-repeat;
        }
        /* IGNORED BY IE6 */
-       div#head div.vectorMenu > h5 {
+       div#mw-head div.vectorMenu > h5 {
                background-image: none;
        }
-       div#head div.vectorMenu h5 {
+       div#mw-head div.vectorMenu h5 {
                background-position: bottom right;
                margin-right: -1px;
        }
-       div#head div.vectorMenu h4 {
+       div#mw-head div.vectorMenu h4 {
                display: inline-block;
                float: right;
                font-size: 0.8em;
@@ -386,17 +386,17 @@ div#head h5 {
                height: 100%;
        }
 /* Panel */
-div#panel {
+div#mw-panel {
        position: absolute;
        top: 160px;
        padding-top: 1em;
        width: 10em;
        right: 0;
 }
-       div#panel div.portal {
+       div#mw-panel div.portal {
                padding-bottom: 1.5em;
        }
-       div#panel div.portal h5 {
+       div#mw-panel div.portal h5 {
                font-weight: normal;
                color: #444444;
                padding: 0.25em;
@@ -406,7 +406,7 @@ div#panel {
                border: none;
                font-size: 0.75em;
        }
-       div#panel div.portal div.body {
+       div#mw-panel div.portal div.body {
                margin: 0;
                padding-top: 0.5em;
                margin-right: 1.25em;
@@ -414,14 +414,14 @@ div#panel {
                background-repeat: no-repeat;
                background-position: top right;
        }
-       div#panel div.portal div.body ul {
+       div#mw-panel div.portal div.body ul {
                list-style: none;
                list-style-image: none;
                list-style-type: none;
                padding: 0;
                margin: 0;
        }
-       div#panel div.portal div.body ul li {
+       div#mw-panel div.portal div.body ul li {
                line-height: 1.125em;
                padding: 0;
                padding-bottom: 0.5em;
@@ -429,10 +429,10 @@ div#panel {
                overflow: hidden;
                font-size: 0.75em;
        }
-       div#panel div.portal div.body ul li a {
+       div#mw-panel div.portal div.body ul li a {
                color: #0645ad;
        }
-       div#panel div.portal div.body ul li a:visited {
+       div#mw-panel div.portal div.body ul li a:visited {
                color: #0b0080;
        }
 /* Footer */
Wiklou, le Wiki du Wiklou